Handle Shift-G to go to the previous match, like firefox. (#320061,

2005-10-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): Handle
	Shift-G to go to the previous match, like firefox.  (#320061, Christian
	Neumair)

diff --git a/ChangeLog b/ChangeLog
index 4bf89c78477b8c9419ce090fb3138d127ab4cefc..0958476d01a0774f35f07e29424127d4e4f7ce87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): Handle
+       Shift-G to go to the previous match, like firefox.  (#320061, Christian 
+       Neumair)
+
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_build_level): Fix a
        C99ism.  (#320000, Kazuki Iwamoto)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4bf89c78477b8c9419ce090fb3138d127ab4cefc..0958476d01a0774f35f07e29424127d4e4f7ce87 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_search_key_press_event): Handle
+       Shift-G to go to the previous match, like firefox.  (#320061, Christian 
+       Neumair)
+
        * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_build_level): Fix a
        C99ism.  (#320000, Kazuki Iwamoto)
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d03ecddcf444bd1d8eaed6d1b2dd6bc249321faf..220c1181d9fd5263e806f5f25cb1f509bb9e262b 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12700,6 +12700,13 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
       retval = TRUE;
     }
 
+  if (((event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))
+      && (event->keyval == GDK_g || event->keyval == GDK_G))
+    {
+      gtk_tree_view_search_move (widget, tree_view, TRUE);
+      retval = TRUE;
+    }
+
   /* select next matching iter */
   if (event->keyval == GDK_Down || event->keyval == GDK_KP_Down)
     {
@@ -12707,7 +12714,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
       retval = TRUE;
     }
 
-  if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK
+  if (((event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
       && (event->keyval == GDK_g || event->keyval == GDK_G))
     {
       gtk_tree_view_search_move (widget, tree_view, FALSE);